From: Jan D. <jan.h.d@swipnet.se>
Date: Fri, 15 Jan 2010 17:01:51 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8236^2~41
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a5ad50ffd4848f43d723d037574f4dd48d1d0258;p=emacs.git

Merge from trunk
---

a5ad50ffd4848f43d723d037574f4dd48d1d0258